Skip to content

chore: rekres#2921

Closed
majabojarska wants to merge 1 commit into
siderolabs:mainfrom
majabojarska:chore/rekres
Closed

chore: rekres#2921
majabojarska wants to merge 1 commit into
siderolabs:mainfrom
majabojarska:chore/rekres

Conversation

@majabojarska

Copy link
Copy Markdown
Member

Follow-up to siderolabs/kres#662

Updates Makefile, creates lefthook.yml

Adds lefthook.yml

Signed-off-by: Maja Bojarska <maja.bojarska@siderolabs.com>

@utkuozdemir utkuozdemir left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was doing this + dep bumps atm as part of my Omni eng duty, but no harm :)

@github-project-automation github-project-automation Bot moved this from In Review to Approved in Planning Jun 2, 2026
instance_id?: string
provider_id?: string
spot?: boolean
tags?: {[key: string]: string}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unintended?

@utkuozdemir utkuozdemir Jun 2, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a generated file, should be result of make generate-frontend no?

@majabojarska majabojarska Jun 2, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was in fact a result of make generate-frontend

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm worried that ci check-dirty did not catch this

@majabojarska majabojarska Jun 2, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just confirmed this diff also appears when running make generate-frontend on main. Seems like this was stale/out of sync?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm worried that ci check-dirty did not catch this

It seems it is because check-dirty only does make generate. Doesn't do generate-frontend - it's an Omni thing.

We could change kres to also to generate-frontend when frontend is detected (no big deal though).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just confirmed this diff also appears when running make generate-frontend on main. Seems like this was stale/out of sync?

Yes, it sometimes happens, we forget to run make generate && make generate-frontend for a while.

(check-dirty thing is relatively new I think, and it only covers generate)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirming check-dirty doesn't depend on generate-frontend, so that's why it didn't catch this (src). I'll be implementing that dependency into Kres, and then we'll rekres in a separate PR.

@utkuozdemir

Copy link
Copy Markdown
Member

Also, need to rebase. I recommend the moment you see This branch is out-of-date with the base branch on a PR, do rebasing as the first thing, because the CI run will be for nothing - you'll need to rebase, and it'll run again.

What I do:

git fetch upstream && git rebase --autostash upstream/main || git rebase --abort

I do || git rebase --abort because I like to use my IDE for conflict resolution.

@utkuozdemir

Copy link
Copy Markdown
Member

Btw, my bump deps PR which already supersedes this: #2922

Disclaimer: I was already working on it, because I'm on Omni duty, and besides, I need image-factory dep 1.3.3 to work on my task #2720.

@majabojarska

Copy link
Copy Markdown
Member Author

Closing, superseded by #2922

@github-project-automation github-project-automation Bot moved this from Approved to Done in Planning Jun 2, 2026
@majabojarska majabojarska deleted the chore/rekres branch June 2, 2026 10:07
@majabojarska majabojarska removed this from Planning Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants